From: Eric S. Raymond <esr@thyrsus.com>
Date: Thu, 9 Jan 2014 16:49:05 +0000 (-0500)
Subject: Remove stray conflicty markar that the VCS somehow ignored.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~1589^2~35
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=32f82e0ca596ed9357d541044970d9133639dc75;p=emacs.git

Remove stray conflicty markar that the VCS somehow ignored.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fa07f2ded55..35627f458bc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< TREE
 2014-01-09  Eric S. Raymond  <esr@thyrsus.com>
 
 	* vc/vc-git.el (vc-git-print-log): Add --follow option to command,